Starting adding Tuner class