#35, #36 Initial support for menus