moved some stuff around; added views; etc.