Added more serialization. Tested, working.