Steven review refactor demo

Madam President,

Please look this over to make sure I did the rebase right.  

Sincerely,

A.C. Fruth