Working on DisplayMenu
Put in more work on the CLI

Still a bunch of functionality missing, but it's late, so whatever.