Switched to IComparable.
Merge branch 'comparable' into develop