lets make this method do something though
Merge branch 'newfeat'

* newfeat:
  lets make this method do something though