Once the new engine has been integrated as it was before, make
all the classes use the new observer functionality.
