snapshot of recent work in master branch.