Should be done with repeater, now just needs testing