I was about to say the same thing. Especially for the first part, it would take some time, but surely it would make a great change.
