Add comments and documents back into Grant -- got lost in the refactoring