Another save...

This commit advances a bit on the lib.