Added new classes, made Storage class with unit tests