City proposes new homelessness plan