The Hoodie Refactor™

This hugenormous PR aims to fix both #311 and #343.

*This is __NOT__ yet ready to be merged* but I'm opening this so we can discuss and track progress.