WIP on Grabber refactoring with tests