Big refactor, much cleaner!  Working Lambda!