Rearanged storage logic, added colors