moving more things around for cli