Final Commit before hackathon presentation