The beginnings of a menu.
Big cleanup and refactoring.