More work on mouse intergration