Most of the day was spent refactoring code. Got buttons and multiple square switch system working now:

Some screenshots of “testing rooms” I’ve built to try out all the cases with the mechanics and make sure things are working before bringing them into the levels:
