Good progress. Bug fixes. More to do