Started adding tuning controls