Updates From Initial Commits

Loads of Updates to the server from TW