Update for deprecations; move stuff about
Start work on client
More work on client