Debugged after refactor, everything working.