Some work on getting versions in sync