Changes from Aaron

more variables, more else ifs