Add Writer and tests