Made use of less functionality
Some code clean up
helper scripts
Merge branch 'master' into backbone
Backbone now working