Added Node class infrastructure to allow easy addition of Nodes as well as much cleaner code
Parsing for all node types