Lay the groundwork for modular parsing
Update readme