Focus issues

Closes #12