Finished the project and testing