some renaming, adds more to steps skeleton