Commit 3

Catcher is now Kirby.