Committing all changes from my 6 hour hackathon.