Pushing what I have

Need to make some changes still so that the correct read methods are
invoked and the right pointers and files are used errywhere.