Some progress -- not yet useable