More stuff working :santa: