Make runner into a class