Working copy for the mergings of insanity

I need to combine my changes with these changes .. and not go crazy!