added menu and such