A lot of work on 9-1

Still more to do. :)