Merge pull request #484 from rjc123/dft_partial_setup

DFT partial setup
Transition DFT to Bouncer