Let's get this blob maintainable...