Examples Refactor

Examples refactor and master branch commits from Grant that were not yet in this branch.