Updated the cli and created the client
Some display things.
Merge branch 'feature/scaffolding' into develop