Moving helper functions into their own file
Moving helper functions into their own file
Merge remote-tracking branch 'origin/master'