Here's yet another idea, that creates seperate classes for the Model (table) and the Entity (row). I think the problem with how we've been thinking about it is that the two have been the same, and in reality they are not.
http://django.pastebin.com/452621
