WIP rewrite for tuner purposes