Cleanup comments
Implement websockets