Squashed commit of:

[CLC-1133] Implementing fix for events beyond 'due next week', with fun refactoring

[CLC-1133] More namespace fixes

[CLC-1133] Renaming from Base -> Merged

[CLC-1133] More timeshifting fiddling