Added some initial tree type handling, still needs work.