refacto cli + wip archive