Port to lens

As far as I can tell, all tests still pass.