Merge pull request #2 from birmr003/master

Tuesday catchup to help with phase 4