Feature new CLI system

Fixes #4
Fixes #6