Added the beginnings of support for lambda