Rewriting track-focus to be smaller and not have any dependencies