Serialization Fixed and Tested Working