Added TODO
Verify that the text is correctly parsed
Removed string parsing tests for now
Simplified code, fixed top level parsing
Fixed parsing