Yeah, let's wait until I finish looking through the rest of it. Sorry it's taken until now to start looking at it...I'll comment on the pull request when I've finalized looking over it. Thanks!