Started using forked branch of cli tools so bugfixes can be made