Remove unused code
Sort out the Reader function types
Get some encapsulation going
Expect parse success