Added Runner class, minor refactoring.