First commit for hackathon 2.0