1.0: Updated to end of hackathon code