Significant refactor of runner