the view works
fix conflicts
challenge view works
merge master