Bunch of changes
Merge branch 'Jose'
Added hop functions
added stuff hop
damn merge conflicts