First commit, embedded client