Add TODO file, add more error checking on serialise.