Post-Hackathon Update
fixing merge conflicts