Command Line Interface *DO NOT MERGE*

Various improvements to the CLi as I develop it. I will ask for a merge when Project Chaos successfully builds trough it.