Tidy up and bring over parder from DRF
Get tests passing.