WIP: Updated versioning