Updated all code, project now complete