Content types finished for now. Seems to work alright, at least in admin.