moved all the orphan instances over from lens
properly guard in CPP