Refactored. Need handling of opening/closing nodes
Minor refactors
Minor refactors
Cleaned up
Functional menu
Cleanup