Add fucntionality for loading saved set choice.
Cleanup.