Adding remaining code to the project