Mozrunner refactor
Part 2