WIP
Client API
Remove puts