Add some kind of command line interface
Add TODO lines