Fixup some missing names.
Move service stuff to its own file.
WAN IP connection shell.