Refactor for efficiency
Refactor to remove redundancy
Merge pull request #1 from tarynsauer/experimental

Experimental