Committing before serious refactor of rand var lookup routines.