[PROPOSAL] Getting the badging to work correctly!