Warren's Refactor

Moving the deck chairs on the Titanic.