Closes #133 @grant is now optional