starting refactor for SASS