WIP: implement skipping and refactor runner