Everything still broken, but good progress.