Simpleview

Merge Trystan's changes