first stage done scripted, rdy for clutter
fixed merge conflicts