Updated this file to match up with sean's engine.py updates.