Partly done making stages more independent and partly done SpatialML scripts