Grillo's affordable housing plan presented to P&Z