Refactor Digger - new methods, remove some