Huge pass on movement code.