Import from previous version
follow rules more closely
Support for lambdas
intermediate commit