actual commit that adds amp control for osc comp
completed merge