refactoring and new commands

> gopher
:ok_hand: