added all changes from CalHacks hackathon