Rewrote file parser, added basic tree objects