City earmarks $12M this year to develop new approach to gun