Parsing pretty much works. Some layout enhancements.