Reorganized. Built buffer. Changed joining better