working on serializer refactoring.

11 files changed