Handling carryovers

I'm not merging this one because I definitely want @puls to review it.