Moved radio stuff to own struct