Add support for jobs and using cli - Take 1