Add comments and basic writer stuff.