Issue 251 - We're still running out of IP addresses (31)