Changes from Friday.

Unsure what I was working on. (Big changes though)