Changes

I will leave comments in the Diff in regards to other parts I just disagree with.
Rather than delete these, can you update them to show good and bad cases as you'd like to see them?