Revert "Merge in dynamic changes"
Merge pull request #9 from Gillingham/revert-8-develop

Revert "Merge in dynamic changes"