Added a TODO comment
Added some more fields to the SharedPreferences.