Almost ready to start working on commands.

Let's start cleaning up and standardising. I want to make use of
FutureSuite API whenever possible.

I'll save the text reading for later.