Post-hackathon final version