We will make this all ng-grid in the future