reverse o/a roles of focus. closes #33