System in place for fire rate upgrade
Consolidate code shared by all entities