Feature/multi property comparisons

WIP. Please do not merge yet.