added new class, need to go to the univercity, will finish it later