Merge molar concentration script from molar concentration branch
Started cleaning up molar concentration script