- Mostly finished parsing cleanup
- still broken parsing to fix up
- added more TODOs that should be addressed
- fix up some broken parsing
- still need to clean up other code