Better thread handling and wired up stories