converted everything

everything has been converted to pull values from the arrays.