More progress getting new styleguide in place