WIP split client methods out
client is working need more tests