Done with mouse changes. Pending tests.