Team check

Here's a code smell for you, by the way: if you find yourself copying and pasting code between files, THINK AGAIN.