refactor the way data is stored.  Added an example class.