Updated private variables for saving

Added private instances of each class so that they can be saved.