Pull part 2

Hopefully this one does better, review wise.