Debug

Pushing latest working changes to master branch.