MOAR work on entity integration