Commit latest changes, add join to activity functionality