Back end: Refactorised threads. #50. Works if new install, doesn't if old.