- Mostly finished parsing cleanup
- still broken parsing to fix up
- added more TODOs that should be addressed