Ah yes, I may have gotten caught by ModelBase being deprecated.
Think I refactored this out later but I'll double check.