Get the upcoming view working

#31