Refactoring some things, flailing on others.