Updated archivist, new function names, easier data management