Created base for tuner. Some minor changes.