Added new functionalities

After meeting, I started finishing the project.