More work and tests. Not done yet.