Basic CLI in place

Merging today's work