Done, I'm still really bad at committing