Beginning to add classes