ripped out console
Merge branch 'newgrants' into testing