Karlon's merged APN code

Wanting to push this out there; it seems like it might work, but Karlon's server won't allow me to connect to test it, and his code isn't checked in, so I can't test it outside of the server either.  Down to the wire, though, so it's going in...