Working to move method between classes to make them more object oriented
Merge remote-tracking branch 'origin/master'