Final commit of hackathon