Danny2

Merging Danny2 onto Working branch.