readded grants table for now
Merge branch 'conversion' into testing