Begin wrapping up our stuff into a CLI tool.
Comment out some dead code but leave a warning to myself.