Further coded the classes in the last update with a  couple more added