TODO #44
Runner usability