Added random starting locations and bases