Changes from review

Made the changes from the meeting review.
All data objects are now private and hidden.