worked on base entity a bit