got it all working again after the crazy refactoring