Work getting things working again after refactor.