Started implementing serialisation