Anthony/in context

Pull request to leave comments here.