I'm about to merge this btw, once we figure out this speed issue. There is no link to any "dark magic", hehe. It's been all trial and error.