Partially fixed primary crasher. Will continue to work on a complete fix.