Refactor/set followups map and datagrid above those of nodone