Add comp

I closed my previous PR to separate my contributions to core into logical units.