Further progress on focus tree
Merge pull request #13 from jpav/master

Further progress on focus tree