Hackathon day 1 - paul
Please merge