Serializer and flow are mostly right, now