Move guniorn from base into production