CS initial commit