refactor the harness application a bit