WIP adding client and fixing stuff
WIP more work