Broke out CLI calls into methods and everything is coded up