Battled all the syntax upgrades, now onto fixing reference moves...