Cleaning up some views, CRUD, and package dependencies. Think I broke something, too :-)