Replace comparator with SSOP version

Closes #3