In middle of refactoring and trying to migrate in diff chain stuff.