Implement more of the read/parse side