Started work on ability to save info