Almost finished with the new crawler core