Final Version after Hackathon