work in progress on Focus handling