Good idea, but will be a pain to merge with all the fast-moving DRF conversion bugs