brought over Jordan's changes, also demo.py works as well as hackathon.py