Finished the project and added javadocs