finishing up
Merge branch 'jarrod-dev'