Yeah, that's for sure because this fails pep8 currently. I'll work on this PR more after CMAC gets done.