more variable shuffling. These will eventually all move to a _variables file, methinks. Also creating partials for common parts in preparation for a bigger move