Happy client

It's awesome so quick thanks to JHB branch