Fully implemented the reader, I'll probably have to update the tests later on...
merge