Hackathon final commit.  Hopefully I'll get back to this...