Initial scala commit