SWOS-121 #comment final commits for language stuff