Initial commit for the Scala branch