Fixed everything for demo except keybind