Name lookup almost working
Name lookup working