More progress, still not quite sorted out