Adding experimental router and views - work in progress