Getting close to correct select build