More progress on Nagger.