Rewrote lambda system, but not done yet.  Ready for some testing.