Started creating the 2 main views

Switching them breaks everything!