Finished with adding stuff to reader class