Worked some of my original code into the specified class format better.