More work on step builder