Got focus changing working. Minor refactor to look more like the cicayda
repo.