[WIP] Move relocate mouse focus

Targets #421