Fleshed out the menu stubs a bit