FEATURE: added cli functions, removed some unnecessary stuff