Add list for badges and working on database