Fixed a ton of problems, added client/server