scott 06 final

pull request for final