Client only

Initial pare down. To the right repo this time. (Don't PR tired!)