First commit for new SASS architecture