switch up master to punt what we'll cover into scratch files