Added rest of project to fix issues