Add in parse and data saving