Did some more stuff, yay