refactor/bunny archive