Looking through TODOs, I was able to do a bunch of them

Next up: the menu.