Unifing the cli accross the bored, moving things up to the library