almost done with ecb cracking refactoring