up to date 8:28 4/19

probably just some variable name changes