Cleanup still more work to do pulling the logic out of the view