Started abstracting the storage/data handling