Things are roughly working again after refactor.