added everything from comp
basically init commit