Added a class. Code needs to change dramatically.