messed around with views
fixed merge conflicts