Thanks guys, I'm now an expert at replacing this lens. you're right there are 2 locator pins at the top of the housing that were really in there in tight. After I got the unit out, it was a 5 minute job.
I bought the replacement lens for $29 from the dealer. Not nearly as good as $7.00