Tim's new code
Merge branch 'master' of https://github.com/andy-olstad/POGSproj3