WiP on entity / template setup