work in progress mouse update