Start moving things to underscore.
Refactoring.