Major clean up of code

New interface for all server communication
Cleaned up Activity code to be more streamlined