My first commit from the standalone client