Implementing Badges, closes #3