Lots of changes to the admin and models files.