continued work on badges, still not sure if will be implemented next week