Started seperation of CLI from runtime