everything working again after refactor.