FRBEV-12 - Finished moving the logic out of the controllers and created a new bundle.