Initial prority work...need to fix step-tests.