Adding vertex picking (slowly...)