Finishing up the gatherer API