modified the way properties are parsed, now, each key has a mass and charge associated to it