Includes changes from awoods and refactoring of roles PEP support

Also includes logging optimizations prior to performance testing.