More refactoring. Still not working.
Fix picking / mouse events