- Added the bulk of the new bandwagon logic