More progress... although need to investigate mouse listener more