+1s on #9851: Round 2

Alright I went through and did a bunch of work on getting to a more official type patch and would like some feedback. Thank You David Genord II