Included Grab/Grapes functionality and fixed compile failures.