Added focus shift.  Closes #1