Some progress, but it still crashes