add geting holdings and some rework