Cli slightly working
Initial tests