Moving CLI to Client to take advantage of pre-written code.