Making a bit of a mess here. These should have gone into build_variants to begin with

Making a bit of a mess here. These should have gone into build_variants to begin with #15