Could this be moved to it's own thread?