Began adding CLI code