Update the trench
Some more improvements to the trench
Started to work on nested views
Removing some old stale files