Started working on CLI. Some minor server changes.