Started reworking the menu system.