Working on badge management, database updates