Made some progress. Still more to do!