PR #164 introduced a saving issue
When saving, a future error is thrown because it's returning a future inside a setState.
Save function needs to be rewritten to accommodate for this issue
Note that it doesn't actually affect saving, but there could be some issue there.
