Kennys proposal

I wrikey erik's idea
Merge pull request #2 from garryk/master

KENNY WIP