WIP, adding menu items. Still need to remove duplications.