Started adding CLI functions