Cleaning up requirements.
Preparing to merge mint & add internal queue