Added TODO
Brought CmdHistory into its own class.