Started work on problematic subscriptor handling but ran out of time.