Cleaned up `client`, working on `data`