Pull job/names/etc data into yaml files and define methods dynamically
Add intmodifiers to fix test
Resolve merge conflicts
Fix specs broken by merge