Meganuke

DO NOT MERGE YET!!!
well how about you do it anyway that works for you at the moment and we fine tune later - I don't want to cause delay in getting the branch merged