Completed Champions!

All the code is finished, just needs to be cleaned up and merged as per
the email you received.