UI persistance seems to work now for the options
Unit tests for model