stage 1 and 2 + stage selector

added some goodies