- Rewrote CLI to work on basis of dictionary of delegates rather than switch
- Added basic command/argument parsing to CLI (can seperate either)