Begin merge

starting to merge already existing code from Capreolus to MenuSystem