Cleaned up the file header to remove the section, and added lambdas and variables.  Still need tests for lambdas.