Added autopair and Pawel's experimental stuff