Fixed insert (potentially)
fixed conflicts
Merge https://github.com/sachinravi14/COS-598C-Project