REFACTORED, BITCH
Started working on the client window
Fixed a merge conflict