Revert "Revert "Done? Maybe?""

This reverts commit 009c948ffb02cfa7c1e69026f801f4b070dc9367.