After an absurd amount of refactoring...things are starting to work again.