Final commit for the hackerthon