Client side refactored, closes #39 and probably #44
Start of larger refactor