updated function variables
redid with new redshift correction
Attempt at implementing classes