Some new classes for the project, but I still modifying some of it