Final commit for haackathon.io submission