Cleaned up mess.  Moved code. Rand pick on =.