Method refactor

This replaces Job with the more general Execution.