Marking this won't fix since it needs to be split up into several bugs based on Martin's recommendations above.
Marking this won't fix since it needs to be split up into several bugs based on Martin's recommendations above.