Overhaul Storage class to fit new specifications

renamed and redid most methods