Fixed an oops
Almost there?

Working on execute class... I feel like it's almost solved...