Move aside April collaboration work and provide clean base.

These are the same set of problems since nobody completed all of them.