Resolved #17

With some slight gaps in the trees.