And version number update to match
More progress