Commiting fix for method name changes and a whole bunch of packet and turn stuff I'm working on. I'm bad at version control.