Fix syntax
Add class definitions