Client and Server interactions are better
Server and client interactions should mostly be working. There may be some bugs which aren't present due to lack of testability at the moment (ie things in removal which are bugged due to the listen not being implemented yet, etc.) Let me know if you find any and I'll look for em
Merged client stuff with master