Kinda working code migration
Merge pull request #8 from timmillwood/7.x

Kinda working code migration