Runner is coming along nicely, will need to refactor this eventually though