Added archiving - closes #11