adding new features and menu (menu doesnt work yet)