More CLI work.

This is going to need a proper config file eventually