Most of work done with new service management. Should handle reconnects
and connections cleaner.