Renamed spawn() to spawn_units, added move_units