* WIP * Do the right things * Add to build matrix * Yaml lint has annoyed me for the final time * Fixes to variant