Pre-pa

Loads of changes, but little of note.