Some more refactoring. I'm sick of it. When do we start working Brain?