In EntityItem, I left two TODO's. Follow them.