Initial work on fleshing out views.
Resolved merge conflicts.
Added core migrations.