everything working - need to clean the view a bit more