This WORKS. Pushing before I start anything else.
Fixed a few tiny things.