What is the molarity of a solution which has a total volume of 100.0 mL and contains 5.8 g of NaCl?

Note: was told the units when calculating concentration is mol for solute, litres for solvent, and mol/L for solution. Im just not sure if I convert first or after I calculate.

mol of NaCl = 23 grams + 35.5grams = 58.5 grams

so you have about 0.1 mol in 0.1 liter
so the molarity is about 1