Another revamp. No more classes
Merge branch 'master' of https://github.com/peteshadbolt/ulo