Pulled some code out of serializer and into completion.