some work on entitys
some work on entitys