Rewrote serializers (not perfect, but pretty cool)