restructuring, start on cli