Adding Metempsychosis, organizing HTH better