[#19] adding joining logic and updating hackathon tests