Moved some things around. Started on ResultWriter