Adding save and new functionality