Preparing to work on FUNCTOR-24