Added upcoming match logic

Still need to add saving