Maybe starting to get the hang of this a bit?

Also strict mode-ing all the the things.