Commit latest changes. Started implementing join activity