making progress towards removing class Data as a singleton with global state.
finished migrating instance variables to objects from a singleton class.