Some edits
Adds new class for second reader