ounis ahmed

to streamline serialisation and deserialition