Refactor of the Reader. Getting stuff right now that we've got the structure pretty much done.