partial commit of the serializer refactors