So, as expected, I wasn't able to work a lot yesterday, but I did have some progress! Anyway, going for jam now, though I'm still applying all the rules from compo!

Meanwhile, clock and lamp working!!