Refactoring for a better implementation

Going to attempt a multiplayer server that can handle more than 5
frames a second :p