Deadline refactor

Pull me