stage 2 ... things mostly working