let's undo the controller stuff a bit
more undoing of adding a chirps controller
Merge branch 'rename-to-chirps'

merging in from undoing controller thing