More changes, added more badges, etc...

Keeping track of pieces, etc... blagh blagh blagh.