City approves working group to solve homelessness