Added more logic to handle moving reminders after completion

Not done yet.