-d is back! And better than ever. This should actually be a nice solution for issue #164. Cleaner, nicer, and more functional.