I lied. Had to fix an issue with button checks.
Uploading the stuff from previous commit. Apparently it got skipped.