Comments and cleanup
Attach sockets to UI and vice versa.