P&Z draft ordinance nears completion