Fixing the project (hopefully)