Revert "Revert "I think I'm done.""

This reverts commit bab5ff89358df3fc6f955bbebee33ebdfa40fd41.