Add and Remove Modules in Email Builder

This problem makes it very difficult to move from Mailchimp to Hubspot when sending emails and newsletters. We have a monthly newsletter that is sent out to clients with a standard template layout that we follow. One HUGE issue is that I have the entire newsletter content/copy in place and then someone might want to include something extra (outside of the normal template) for just that month and there is no way to add an additional module to the email. We can add that section to the template and then create an email from that template again but then you lose ALL of your content and have to start over when it was nearly completed.