Add rest of reader stuff