Client work [WIP]

by Aaron Sananes