Completed parser and simple rendering

- Switched to using combinator parser
- Tests added for some edge cases