Interim check in

Still facing serialization issues.