Allow for external storage or not
Clean up + doc