cleaned up the code quite a bit and made more use of serializers.