Feature/move code from scalding