Revamped because I'm lame and have another fandom craving...