Feature complete

Final Model and ModelAdmin definitions