City-wide Ethics Proposal up for Final Vote