Work on CLI tool, archive feature