all that's left is prediction tool and add in video
fixed conflict