Logic changed: remove writer class. Maybe finished..