new structure barely working
refactore to use partial
add faye
websockets working