views are much simpler now. Need to be tested, but much simpler