Added some more menu options, no stubs yet.