added runner, cleaned up presentation a little, refactoring