First commit for new menu system