Revamped without logging hack and cleaning up runner to properly use executor service