Starting to work on basic version selection
Minor changes