Change how we construct entities

As there are many ways this could be constructed this is cleaner
We should probably do this for everything..