changes
merge conflicts
added menu beginnings