Thanks Rainyday.

I'm in the process of reworking this.