Change in how data is saved

Current Goal Label is now saved instead of index; this allows the code
to be more future-proof.