Add rest of the class (not finished)