Refactured a bit, added enums, working on supp for exec reports