Move this up a level so we don't have to include yet another class and cause problems.