THIS R PULL REQUEST

I might have missed something. Who knows!!

I didn't look at your JavaScript once while I was doing mine, but then I compared after I was finished. Would love to discuss the differences.

Also this is my (Nikki's) work since Oliver made his own branch after I left.