OO: Ready to refactor. --author=sparrowli