I might end up making it so that manny is still optional (but set up some easy method of switching).
That sounds good to me. Alternatively, seeing that Manny is the future, you could set that one to be the default and have an easy method to switch back.