Updated 29/09

Add some new classes