Break compat out into it's own module and fix admin.py queryset