Working version for gerrit

- Still dont have sputnik to download