2nd CLI commit

All the code I have been working on.