3rd pass of daves view editor