Started working on the OutOfContext feature