works with our crashing.

needs testing and debugging.