Most feature highlighting now working