Drafting first commit for merge
Updating with menu information