Id wait for @jtimberman to weigh in before making changes. I'm just one opinion :)