added a random function for the horsies.
magaged conflicts