Stupid commit
Reverted to buttonless implementation
Ready for a day