Work on beta adding new capabilities consistent with lambda
More updates to beta3
Merge branch 'f-lambda'
files moved to appropriate folders