Zack

Agreed, sounds like a good plan. A separate pull here might also be nice.