State of project as I submitted it. No clue what's in this commit