Implements CLI back into new work
Finishing up on tests