I think i was to hasty with merging this in, i want to take a closer look. going to "revert" the merge