Closes #29, fixes the archive