moving some broker stuff around