Added various stuff over time. I can't remember the specifics