Move more stuff through cancan