Update TODO
Use a class method for all these readers
Move all preset instance variables up to readers with defaults