WIP refactoring the crawler