Swapped order of arguments.
Fleshed out Serialisation tests, but not complete yet.
Finished Serialisation for now.