yes. It's done (but not yet pushed. Waiting to finish all the corrections about our discussion on how it should work)