Cross-check codes and push your final

[ioabdullahi]

please cross check your codes , make sure it conforms with the MVC architecture and getX state management logic is being used , then notify me, after i check i will ask you to make a pull request to dev