Still working through deserialisation.

I've had to redesign and reorder some bits that rely on other bits of the process. Annoyance.