Added stuff that I'd previously done