First version working fully with menus!