Finally closes #26. Entirely. That was tedious.