Getting ready to add platform config specific