Cleaning up templates
Cleaning up templates
Can now use WebSocket to send DSL
merge