add account, grouping model; rework product, stock