I spend one pomodoro trying to do the major refactoring but I started seeing how much code was going to be affected, and decided that it would be too long for this to be ready tom. I spend the next pomodoro implementing the work-around, editing activities is now fully functional!