Initial work to use scala substeps