update sass again and begin rewriting