next refactor step
connector works
stable