Sure, I sent a update now, to not add more spaghetti than needed I split most of this out to a separate function.