Code I've worked on mostly by myself
Merge https://github.com/efigueroa/CS335