Rk/transition object

could we revert this part? (separate pull request)