Switch to using Grape; refactoring