Refactors, adds crawler skeleton