This should probably be non-blocking (likely the cause of the crash I had earlier)