Migrating more of the views in