Ryan a dev branch

Changes approved by Ryan Fletcher, ready to pull into Master Branch