Slowly moving controllers and views over to collections