Ahh... I see now there are a few different lambdas about. This may take a bit of redesign.