Move creating units to script