add - this. having problems, rename some vars, methods, and properties