Well.... Jeremy just pulled this branch, what should I do? @michaelficarra