Worked on most of code with Sarah in class, forgot to upload the rest
Edited