Improvement to versioning.

Start on reflection