Refactored code and added await to stop race conditions#507

abeverley merged 2 commits intoctrlo:devctrlo/GADS:devfrom

droberts-ctrlo:autosave-fixdroberts-ctrlo/GADS:autosave-fixCopy head branch name to clipboard