Reorganised previous commits.

Slight de-bodge...