huge styleguide progress, almost ready to merge