Separate version selection and building #25