Finished diagnostic implementation.  Bootstrap and diagnostic now run fully in parallel.