Added patches and exceptions
Progress?