For #6 greatly refactored the writers (again) to simplify them down to bare bones