Match previous implementation functionality on master with the new implementation as much as possible.

For any long task that will need reimplementation or a new architecture, it should be documented and new tickets created for tracking the work.