Add rebuild with crash detection and what not