view stuff now moved to the view
merge resolved