running out of enthusiam for debugging this, lets just get it into master so we can prevent even more damage
