Catching bugs, almost done