Most of the stuff is decoupled now.