Several changes, new classes for all the play modes + trainer