Closes #13 Implmenting @grant