DEAD BRANCH
Merge was having issues, moved necessary code to master branch