Tidy Up + Furture Work

Tidied up some of the code reduced the amout of this

started to outline the framework that will be used to let the server
and client perform actions such as check user and make sure that the
connection is still alive etc.