Cool, just ping me via comment when you're ready then I'll happily merge this.

Awesome work, by the way..:)