SPP movement.

Tidied up and reviews spp movement code.