Changed TODOs, worked on entity.