last commit to matt... now to figure out how to merge with the radically different master branch...