WIP Refactor commands so that they are individual classesi.

Instead of inline in the CLI class to make it more extensible.