Just thought I'd send this over so you could see ... I'm not actually wanting you to merge this.

Just moved some things around and switched to using a list comprehension. Not sure which is faster, or if they're even different.