Some more stuff that I hadn't comitted