Made some adjustments and added TODO's on what needs to be done
Merge pull request #1 from icecreammatt/master

Fixed name to work with test script.