Nice work there Aaron, and you're right to leave the lamp lenses until after painting. If it's the under-wing ID lenses, personally I rarely use them, preferring to fill the 'lamps' with the relevant coloured paint, and then, when fully dry, glazing the lamps with a drop of Micro 'Kristal Kleer', or PVA.
Thanks guys and thank you Terry for the info on the three colored lights on the left wing. Will try that, they do not have lenses for them in this kit. Just one under the right wing.