Retro thread buffer

Still needs more refactoring...