FIrst commit with menu working