got the post-hackathon version in here
added new version post hackathon