Overhauled house scraping, not quite working 100% yet