tyrone works thru some arbitary changes and fixes before staging migration
Merge branch 'master' of github.com:Fishgate/OIM