When I first started working on dragAndDrop I tried to add composable components instead of wrappers, but for some reason dragDropMonitor was not firing did-stop-dragging event and thus the calendar should remain in a drag state even after we had dropped. Further research and experimentation is needed here. Composable components IMO will clean up the codebase as well.