Trying to fix it right, so taking a bit of time, I can do hacks if someone needs master jenkins green quicker and yells