Preparing to branch off to test new view
Fixed GCD and cacheing problems
fixed merge conflicts