consolidated shit, added menu options