Dwd mega rebase

Sorry. For some reason github thinks I didn't send you the CursorLoader commit so it's here again =/