Almost there...
final version
final version with class changes