Started working on issues regarding editing/saving at the same time.