WiP: Test on loading views
Merging conflicts