Copying in our apexecute additions as well as some PEP8 jazz