Revert "Merge in dynamic changes"

Reverts Gillingham/evething#8