Some initial grant testing
Little bug fix