Many changes but now a menu
Some meta file conflicts