Versioning prep

Updates to versioning.