Names working

Now the names should be working. Running a lot faster too