WIP -- Add comparison objects