Finished logging
Work on logging, added websocket support and some renaming of constructs