Entity enginiring

It's time to merge