Added a few more lines ot this
Merge branch 'develop' into jared

* develop:
  Added a few more lines ot this
My changes