Made it awesomer.

Sorry for the sucky commit messages.