CLI version seems to work, TODO: service version