The world is safe again

Rewrote the missing code (minus comments, sadly), and found a bug. Like most bugs it was a small type -- copy/paste issue, probably -- which took me hours to find.