Added Dan's Edits

Changed class names and added another class