This should been in its own class file.