still some major moving around and additions, not at a stage where small steps are feasible