Lindsey

added views back for merging.