I hope so!! I'm just assuming that it will be all about finding a way to bring Elena back and give her scenes with all of her loved ones again, but I would love it if they find a way to include Katherine in the finale as well. She really deserved better :(