started working on comps (not yet done)