more base work on entitys