switching to other branch
fixed iss1
merged iss1 fixes
finished graphing funcs