Lots of work on the version checking