Cleaning up some TODOs.
Experimenting with menu callback style. Very, very cool.