Large update to project