Made storage mechanism easier to modify. Compartamentalized gets and set methods.