Final version for hackathon handin