Rough draft for entity extrapolation; Update TODO;