adding Controller.replace back in w/ tests!