need to add scoping to class declarations